Merge branch 'JAL-1360_Branch' into Release_2_8_2_Branch
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 18 Sep 2014 13:16:21 +0000 (14:16 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 18 Sep 2014 13:16:21 +0000 (14:16 +0100)

Trivial merge