Merge branch 'master' into 1236-database-changes

# Conflicts:
#	src/Forum/Controller/IndexController.php
#	src/User/UserMetadataUpdater.php

src/Http/Middleware/SetLocale.php

@@ -46,6 +46,8 @@ class SetLocale implements Middleware
             $this->locales->setLocale($locale);
         }
 
+        $request = $request->withAttribute('locale', $this->locales->getLocale());
+
         return $handler->handle($request);
     }
 }