pull changes from wtsi master (version 1.15) to devel