# HG changeset patch
# User Nicholas Jillings <nickjillings@users.noreply.github.com>
# Date 1449226659 0
# Node ID 27d44af3df3d1b12241bbf8762c6f7232a127d00
# Parent  592c412ae87b87b974295411bc56bda185a7ccd4# Parent  866b0fcaa139be32d6413dae3b790159744e9820
Merge from branch "WAC2016"