Merge branch 'features/JAL-2446NCList' into features/JAL-2609fastPaintWrapped
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 10 Aug 2017 15:25:51 +0000 (16:25 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 10 Aug 2017 15:25:51 +0000 (16:25 +0100)

Trivial merge