Merge branch 'JAL-1395' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 16 Oct 2013 16:41:46 +0000 (17:41 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 16 Oct 2013 16:41:46 +0000 (17:41 +0100)

Trivial merge