Fix for cake v1.7
Merge branch 'CoffeeDev'