# HG changeset patch
# User Nicholas Jillings <nickjillings@users.noreply.github.com>
# Date 1449226855 0
# Node ID 65b97da472dcb5cf0ce1b7ce650304dcccde34b4
# Parent  6703e0137cfc52fd7e3b067e2eaf65be0b0aea17# Parent  27d44af3df3d1b12241bbf8762c6f7232a127d00
Merge of dev into default/master