# HG changeset patch
# User Adam Stark <adamstark.uk@gmail.com>
# Date 1416956413 0
# Node ID ce802aba0a6aac1368a33d8dec06806797f5e202
# Parent  fd3ac263f42bc632cdf284de9c0c9e2d3b1b85f5# Parent  2d8cf287848314c3dd74f716f36527fb7cfc43bd
Merge branch 'release/1.0.2' into develop