Merge branch 'bug/JAL-2600resizeflicker' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 28 Jun 2017 14:16:17 +0000 (15:16 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 28 Jun 2017 14:16:17 +0000 (15:16 +0100)

Trivial merge