Merge branch 'JAL-1319_jronn_npe' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 17 Jun 2013 17:26:54 +0000 (18:26 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 17 Jun 2013 17:26:54 +0000 (18:26 +0100)

Trivial merge