Fixing merge (it's late)
Merge branch 'ssl-fixes' into production