Merge branch 'features/JAL-2446NCList' into features/JAL-2609fastPaintWrapped
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 2 Aug 2017 14:24:16 +0000 (16:24 +0200)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 2 Aug 2017 14:24:16 +0000 (16:24 +0200)

Trivial merge