cakephp/cakephp — pull request #5012 by markstory (2014-10-30 01:38:13+00:00)
Title: Fix a few issues.

Fixes #5011 and #5002 .