Merge branch 'bug/JAL-2245enaXmlChange' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 4 Oct 2016 15:03:18 +0000 (16:03 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 4 Oct 2016 15:03:18 +0000 (16:03 +0100)

Trivial merge