Merge fix-ajax-and-cronjobs in master.