Trying to fix the CakePHP 2.1.0 test pass for the ImageHelperTest.php
Merge branch 'develop' into feature/documentation