Merge branch 'master' into 'favorite_history'

# Conflicts:
#   config/routes.rb
Status Job ID Name Coverage
  Build
failed #3122
build

 
  Test
skipped #3124
allowed to fail
codequality
skipped #3123
test
 
Build build
No job trace