pull from wtsi master back to devel

pull from wtsi devel to master to create release 47.8 (switch to scratch110)