Fixed email link (fixes #186)
Merge remote-tracking branch 'origin/production'