Merge branch 'develop' into bug/JAL-1841rnaSecStr
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Aug 2016 08:01:06 +0000 (09:01 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Aug 2016 08:01:06 +0000 (09:01 +0100)

Trivial merge