Don't ask me why.
Merge branch 'social_live' into test_integration.