Merge branch 'development' into release
Update drupal users mail after mail have changed in the profile
Merge branch 'release' into development