more ammo_worker_api split up work
Merge branch 'master' into gh-pages