Merge branch 'hotfix/JAL-1521' into Release_2_8_1_Branch Release_2_8_1_Branch
authorunknown <jprocter@LS30023.ad.lifesci.dundee.ac.uk>
Thu, 23 Oct 2014 21:34:07 +0000 (22:34 +0100)
committerunknown <jprocter@LS30023.ad.lifesci.dundee.ac.uk>
Thu, 23 Oct 2014 21:34:07 +0000 (22:34 +0100)

Trivial merge