Merge branch 'master' into 'issue22'

# Conflicts:
#   www/min/doi.min.js
Status Job ID Name Coverage
  Build
failed #4767
build

 
  Deploy
skipped #4768
allowed to fail manual
deploy_production
 
Name Stage Failure
failed
build Build There is an unknown failure, please try again
No job trace