Merge r2552 into master