Fixes Issues #1 and #2
Fixes #3
Fixes #3, #4
Merge remote-tracking branch 'remotes/origin/2.3.x'

Conflicts:
	app/views/users/_mail_notifications.html.erb