Adding some additional options for confirmation email
Merge branch 'origin/master'