Merge branch 'master' into 'id2-id3'

# Conflicts:
#   app/views/home/index.html.erb
Status Job ID Name Coverage
  Build
canceled #2212
build

 
  Test
canceled #2214
allowed to fail
codequality

canceled #2213
test