Merge branch 'bug/JAL-2721fastPaintNPE' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 12 Sep 2017 13:54:15 +0000 (14:54 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 12 Sep 2017 13:54:15 +0000 (14:54 +0100)

Trivial merge