Merge branch 'develop' into features/JAL-1793VCF
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 20 Feb 2018 12:50:35 +0000 (12:50 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 20 Feb 2018 12:50:35 +0000 (12:50 +0000)

Trivial merge