Merge branch 'master' into BATCHEE-65