Merge branch 'features/JAL-2446NCList' into features/JAL-2609fastPaintWrapped
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 9 Aug 2017 10:46:36 +0000 (11:46 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 9 Aug 2017 10:46:36 +0000 (11:46 +0100)

Trivial merge