Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 16 Nov 2016 12:35:15 +0000 (12:35 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 16 Nov 2016 12:35:15 +0000 (12:35 +0000)

Trivial merge