pull from wtsi devel to master to create release 80.5