Merge branch 'JAL-1315_headlessEPS' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 13 Jun 2013 15:55:18 +0000 (16:55 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 13 Jun 2013 15:55:18 +0000 (16:55 +0100)

Trivial merge