# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1511277216 0
# Node ID 5d8e320df9c783f2e960d65aaefe2027e72e324b
# Parent  a6ad28a52cc7ebff6c00c1fab713847951fb3401# Parent  a5da95ad84f9dd19821460c1b1515e7a8f69ffcb
Merge branch 'master' into vnext