Merge branch 'develop' into features/JAL-2609fastPaintWrapped
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Aug 2017 14:53:42 +0000 (15:53 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Aug 2017 14:53:42 +0000 (15:53 +0100)

Trivial merge