Changes from wtsi-npg:master up to release 1.5.3