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

Trivial merge