fix email notifications and session cleanup after order has persisted
Merge remote-tracking branch 'origin/master'