Merge pull request #1 from diaspora/develop

Develop