Reloading the AsyncJob in a couple of places (409 problem).
Merge branch 'master' into staging