Merge branch 'develop' into features/JAL-1793VCF
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 Nov 2017 10:25:22 +0000 (10:25 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 Nov 2017 10:25:22 +0000 (10:25 +0000)

Trivial merge