Merge r2557 into master