Adjust Thanks you order emails
Merge remote-tracking branch 'origin/master'