Merge pull request #1 from owncloud/master

Merge with owncloud:master