Merge remote-tracking branch 'origin/master' into gsb-atomic-ops