# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1505239581 -3600
# Node ID e2e189785bfa3008e0681f77eccd9b71ec6232c0
# Parent  209532a650dad40494b8167b8d0ce6873d579843# Parent  76c06bd88bbe74431e393f4e47064122a2e7c127
Merge branch 'master' into vnext