I'll fix locally and check if no tests get broken. No tests got broken. I'll commit the fix after hudson finishes running our tests for the CR14 release.
