Merge branch 'develop' into 'iss-149/profile-fields-setting'

# Conflicts:
#   test/unit/specs/modules/users.spec.js
3 jobs for iss-149/profile-fields-setting in 9 minutes and 15 seconds
Status Job ID Name Coverage
  Lint
passed #114230
lint

00:02:30

 
  Build
passed #114231
build

00:03:03

 
  Test
passed #114232
test

00:03:41