Bundle update
Merge branch 'master' into staging; bring download restrictions into staging.
Annotator - remove ajax/batch checkbox.