Merge branch 'bug/JAL-2210_hack_for_Release_2_10' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 4 Oct 2016 14:12:19 +0000 (15:12 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 4 Oct 2016 14:12:19 +0000 (15:12 +0100)

Trivial merge