Merge branch 'master' into 'develop'

# Conflicts:
#   Gemfile
1 job for develop in 27 seconds (queued for 1 second)
Status Name Job ID Coverage
  Build
passed build the website #138596

00:00:27