Merge branch 'master' into 'user_login'

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

 
  Test
canceled #2707
allowed to fail
codequality

canceled #2706
test