Merge branch 'develop' into bug/JAL-1841rnaSecStr
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 16 Aug 2016 15:52:37 +0000 (16:52 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 16 Aug 2016 15:52:37 +0000 (16:52 +0100)

Trivial merge