cakephp/cakephp — pull request #4153 by markstory (2014-08-03 13:12:52+00:00)
Title: Fix a few issues

Fixes #4113 and #4143