Merge SSL Support
Merge SSL Support back to master