# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1504705800 -3600
# Node ID 3342bc1f325682a5b598a6adf38ff03be66af0ec
# Parent  f57581f200681f79cc91bcf00e606cb573f0ecd6# Parent  151fae569ce932cc810a4540272eed6d1f1de95b
Merge branch 'master' into vnext

# Conflicts:
#	js/core.js