Merge head up to r275326.