2.5

Fixes https://github.com/cakephp/cakephp/issues/1757 plus updated with feedback from https://github.com/cakephp/cakephp/pull/1302