Merge branch 'master' into dev-se-266
Merge branch 'dev-se-266' of https://github.com/PLOS/ambra into dev-se-266