Remove outdated email addresses See merge request !252
Merge master into production See merge request !253