Keep up with Cake 3.x definitions.
Merge pull request #179 from bar/cake3-cake3

Keep up with Cake 3.x definitions.