Merge branch 'develop' into staging
Add back some deleted autogenerated files
Force use Agg backend for headless
Merge branch 'develop'
Add generated files