Merge branch 'master' into oc_preview

diff --cc apps/files/js/file-upload.js
Simple merge

diff --cc apps/files_sharing/js/public.js
Simple merge

diff --cc apps/files_trashbin/index.php
Simple merge

diff --cc lib/base.php
Simple merge

diff --cc lib/helper.php
Simple merge

diff --cc lib/util.php
Simple merge