Merge branch 'develop' into bug/JAL-3184restoreGroupVisibility bug/JAL-3184restoreGroupVisibility
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 14 Jan 2019 14:05:22 +0000 (14:05 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 14 Jan 2019 14:05:22 +0000 (14:05 +0000)

Trivial merge