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

Trivial merge