# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1516369685 0
# Node ID b89e760e091be4c545bd66b87f477854d0de8c0a
# Parent  7820ce4a96c0a36d6c18a27000b2c9736c73f2c4# Parent  24681d53ee7abe5f9b21fe6d9f97f48a982d54ee
Merge branch 'master' into vnext