Update to diaspora/diaspora master