Merge changes from wtsi-npg:master for 0.8.3