Merge branch 'master' into fileapi

Conflicts:
	lib/private/files/cache/updater.php
	lib/private/files/view.php
	tests/lib/files/filesystem.php