Fix SSL finish fbauth
Finish merge.