Merge branch 'bug/JAL-1230' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 23 Jun 2013 18:06:14 +0000 (19:06 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 23 Jun 2013 18:06:14 +0000 (19:06 +0100)

Trivial merge