Merge remote-tracking branch 'origin' into ceej/tiered-tests