# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1489749927 0
# Node ID 8f485581ee733f4219c1aeda6d2049adb812369c
# Parent  7b1dfb582637b1eb10cb49958d6e0ff869fc67cf# Parent  ad57c5c755d4ab18b7ba365eb1799f801834f6f8
Merge branch 'master' into vnext

# Conflicts:
#	js/core.js