Merge branch 'master' into 'user_login'

# Conflicts:
#   app/controllers/users_controller.rb
Status Job ID Name Coverage
  Build
failed #2729
build

 
  Test
skipped #2731
allowed to fail
codequality
skipped #2730
test
 
Build build
No job trace