Merge remote-tracking branch 'origin/bug/JAL-2722' into portforward/JAL-2675_2102b1to2103 portforward/JAL-2675_2102b1to2103
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 6 Sep 2017 10:43:37 +0000 (11:43 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 6 Sep 2017 10:43:37 +0000 (11:43 +0100)

Trivial merge