Task #150: Fix social lins for Safary
Merge branch '150' into 158