[#785 state:resolved] fix for ssl problem needs to be handled on server side as well
Merge branch 'rm_production' into wip-open
Merge branch 'wip-open'