Merge branch 'hotfix/ace-editor' into development
Merge branch 'master' into development
Force autoload but no behat require since it is in the behat module
Merge branch 'release/release-2-11-2014_1_5_8'