Merge branch 'develop' into Release_2_9_Branch
authorunknown <jprocter@LS30023.ad.lifesci.dundee.ac.uk>
Sat, 9 May 2015 11:25:37 +0000 (12:25 +0100)
committerunknown <jprocter@LS30023.ad.lifesci.dundee.ac.uk>
Sat, 9 May 2015 11:25:37 +0000 (12:25 +0100)

Trivial merge