Merge from iainrb to wtsi-npg for jenkins test