Catch-up merge from master, mainly to pick up gcbench fixes.