# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1508274130 14400
# Node ID ab52da8becbe3a660dbf21c603b41c1da4bde531
# Parent  25177b93616f7f7798c6aab04926f3d21d5c7925# Parent  bfd19c39f2f3f30dbc93c786d851149540cdf428
Merge branch 'master' into vnext