Merge pull request #216 from wtsi-npg/devel

Release 80.4
Merge pull request #219 from wtsi-npg/devel

pull from wtsi devel to master to create release 80.5
Merge pull request #220 from wtsi-npg/master

pull release 80.5 from wtsi master to devel