# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1506336942 -3600
# Node ID 25177b93616f7f7798c6aab04926f3d21d5c7925
# Parent  6b76962f58af2b7831a14a1904aa57dc6de4889e# Parent  b3c0fcd60a2934bae47d6e7bda9f15269e1dbce5
Merge branch 'master' into vnext