Merge branch 'bugs/JAL-2922' into releases/Release_2_10_4_Branch
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 7 Mar 2018 12:05:23 +0000 (12:05 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 7 Mar 2018 12:05:23 +0000 (12:05 +0000)

Trivial merge