Merge pull request #1441 from TheMysteriousX/v2.x.x-fix-disable-ssl