Merge branch 'JAL-1364_patch' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Feb 2014 16:28:21 +0000 (16:28 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Feb 2014 16:28:21 +0000 (16:28 +0000)

Trivial merge