Merge branch 'develop' into bug/JAL-147scrollWrappedView
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Jul 2017 15:20:37 +0000 (16:20 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Jul 2017 15:20:37 +0000 (16:20 +0100)

Trivial merge