Merge branch 'bug/JAL-3218scalePanelPopups' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 16 Apr 2019 11:48:31 +0000 (12:48 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 16 Apr 2019 11:48:31 +0000 (12:48 +0100)

Trivial merge