Fix for failing build
Merge branch 'master' into add-cakephp-26-to-build-matrix