Merge r2556 into master