Some changes to remove some PHP warnings in conjunction with the
Owncloud plugins.
Merge branch 'old-stable-owncloud' into old-stable-rotdrop