Merge commit '72c628b' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 23 Jun 2013 12:58:51 +0000 (13:58 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 23 Jun 2013 12:58:51 +0000 (13:58 +0100)

Trivial merge