Merge pull request #154 from wtsi-npg/devel

pull request from wtsi devel to master - release 76.5
Merge pull request #155 from wtsi-npg/master

pull request from master to wtsi-devel  (release 76.5)