Merge branch 'JAL-1454_patch' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 25 Feb 2014 16:49:49 +0000 (16:49 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 25 Feb 2014 16:49:49 +0000 (16:49 +0000)

Trivial merge