AjaxTimeout = 20000
Merge branch 'master40'