Merge master into oc_preview

diff --cc apps/files/css/files.css
Simple merge

diff --cc core/css/styles.css
Simple merge

diff --cc lib/base.php
Simple merge

diff --cc lib/helper.php
Simple merge