Opensocial changes from @codyhoag

@codyhoag is sending you the changes for 6.1.x too.