Merge r2518 into master