pull request from wtsi master to devel - release 0.05