[ros-diffs] [fireball] 25793: Merge 25729 (calc.exe fix)