# HG changeset patch
# User Nicholas Jillings <nickjillings@users.noreply.github.com>
# Date 1449226659 0
# Node ID bb60dabbd616719f15ba723cbacaed7845d80ea1
# Parent  e622897605870ffbccb19ec0ff8edbc420cc2bf9# Parent  4f77788663ebe5c34e77ef5f3268d22ed29d41d6
Merge from branch "WAC2016"