# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1505391231 -3600
# Node ID cacc7f1cf062f8fd11cd8a23ab90c97e5b6d7752
# Parent  9cdcde1dafd8b10b55ea132857bf3a90bc1f70d7# Parent  8805556c0f42755f47ec6afd68b7b2b6ef6bb1d3
Merge branch 'master' into vnext