# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1505221451 -3600
# Node ID 209532a650dad40494b8167b8d0ce6873d579843
# Parent  cae294cb0242313812fd20afa729fd996efaebf5# Parent  8bcba5c956560f482487ad2f1b4201b72c68032c
Merge branch 'master' into vnext