Fixing all https related issues
Merge branch 'https_fix' into massdeleter-fix