Merge remote-tracking branch 'upstream/master' into configurable_owncloud_temp_dir (reverted from commit 2f08e7e669389fca749e9a1de9e6fbd3796df546)