pull request from wtsi devel to master - release 0.05