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

Trivial merge