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

Trivial merge