fix spree ssl
Merge branch 'master' into production