Merge branch 'features/JAL-2446NCList' into features/JAL-2574findFeaturesByColumn
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Jun 2017 15:36:22 +0000 (16:36 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Jun 2017 15:36:22 +0000 (16:36 +0100)

Trivial merge