Merge pull request #39 from wtsi-npg/devel

pull changes from wtsi devel to wtsi master - for release 74.2
Merge pull request #40 from wtsi-npg/master

pull master to devel