Merge branch 'master' into files_encryption

db_structure.xml

lib/files/cache/cache.php

lib/files/cache/scanner.php

lib/files/cache/watcher.php

lib/files/view.php

lib/hooks/basicemitter.php

lib/hooks/emitter.php

lib/hooks/legacyemitter.php

lib/util.php

tests/lib/files/cache/cache.php

tests/lib/files/cache/watcher.php

tests/lib/files/view.php

tests/lib/hooks/basicemitter.php

tests/lib/hooks/legacyemitter.php