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

Trivial merge