Merge branch 'master' into type-hinting

Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php

diff --cc lib/private/image.php
index e0397ec8a00776c36bfdc9a4bf2ef41930168f6b,c987ce92c3c6d8257d96b791482c3f7fa465f51e..f1b8acc41b745d1547a3ca20cafcb00aeb8116f4
--- 1/lib/private/image.php
--- 2/lib/private/image.php
+++ b/lib/private/image.php
@@@ -34,8 -34,8 +34,8 @@@ class OC_Image 
  
        /**
        * @brief Get mime type for an image file.
 -      * @param string|null $filepath The path to a local image file.
 +      * @param string|null $filePath The path to a local image file.
-       * @returns string The mime type if the it could be determined, otherwise an empty string.
+       * @return string The mime type if the it could be determined, otherwise an empty string.
        */
        static public function getMimeTypeForFile($filePath) {
                // exif_imagetype throws "read error!" if file is less than 12 byte

diff --cc lib/private/l10n.php
Simple merge

diff --cc lib/private/server.php
Simple merge

diff --cc lib/private/share/mailnotifications.php
Simple merge

diff --cc lib/private/template/base.php
Simple merge

diff --cc lib/public/iservercontainer.php
Simple merge

diff --cc settings/admin/controller.php
Simple merge

diff --cc tests/lib/appframework/routing/RoutingTest.php
Simple merge