Conflicts: cake/libs/view/helper.php cake/tests/cases/libs/controller/components/request_handler.test.php