Merge pull request #1 from owncloud/master

Rebasing