Merge branch 'master' into develop
Merge branch 'maintain'
Test fixing UTF-8 issue with spree_email_to_friend