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

Trivial merge