# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1493048582 -3600
# Node ID 81a0a0fbfc697ca47423f02ece3ca02cc4fdd4aa
# Parent  ae6d56a300c5701eaa76b3aadfcdd625f3f805db# Parent  dfc2959fb7c666edbbc129a4764bede7fffa2c5d
Merge branch 'master' into hot_fix