Minor changes
Merge remote-tracking branch 'remotes/origin/nojquery-ajax'