# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1492183699 -3600
# Node ID a6a0d2b786af3f9382f3addaf6dc58157e11b1bc
# Parent  04cc7a27ae6482a4e7e58f880bde16c3766936f1# Parent  d30222a70f2dd47ba3a6fc750385229af2afc619
Merge branch 'vnext' into hot_fix

# Conflicts:
#	js/core.js