Merge branch 'develop' into features/JAL-1793VCF
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Sep 2017 12:34:10 +0000 (13:34 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Sep 2017 12:34:10 +0000 (13:34 +0100)

Trivial merge