Merge branch 'master' into share-search-mime

core/img/actions/add.png

core/img/actions/add.svg

core/img/actions/close.png

core/img/actions/close.svg

core/img/actions/delete-hover.png

core/img/actions/delete-hover.svg

core/img/actions/delete.png

core/img/actions/delete.svg

core/img/actions/download.png

core/img/actions/download.svg

core/img/actions/upload.png

core/img/actions/upload.svg

core/img/actions/view-close.png

core/img/actions/view-close.svg

lib/private/files/view.php