Merge remote-tracking branch 'wtsi-npg/master'
Merge branch 'master' of github.com:keithj/baton