Merge branch 'master' into ceej/tiered-tests