Merge r2565 into master