Merge branch 'develop' into features/JAL-1793VCF
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 16 Nov 2017 12:20:04 +0000 (12:20 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 16 Nov 2017 12:20:04 +0000 (12:20 +0000)

Trivial merge