FAQs re-arrange feature like categories #951
SSL compatibility #955
Merge remote-tracking branch 'upstream/master'
Merge pull request #962 from oliverds/master

SSL compatibility | FAQs re-arrange feature like categories