Merge pull request #2 from wtsi-npg/devel

pull from wtsi devel to master to create release 47.0
Merge pull request #3 from wtsi-npg/master

pull from wtsi master to devel post release 47.0