ajax related fix lost in merging
Merge pull request #584 from herby/fix-lost-in-merge

ajax related fix lost in merging
Merge branch 'master' into requirejs