Merge github.com:ajaxorg/ace
Merge branch 'master' into xquery_refactoring