Merge branch 'Release_2_8_2_Branch' of local repository into features/JAL-1596ChimeraREST
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 5 Dec 2014 08:38:37 +0000 (08:38 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 5 Dec 2014 08:38:37 +0000 (08:38 +0000)

Trivial merge