Merge branch 'develop' into bug/JAL-2436featureRendererThreading
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 15 Mar 2017 08:49:59 +0000 (08:49 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 15 Mar 2017 08:49:59 +0000 (08:49 +0000)

Trivial merge