Merge branch 'develop'

EventSubscriber/User/UserRolesEventSubscriber.php

@@ -46,7 +46,7 @@ class UserRolesEventSubscriber implements EventSubscriberInterface
 
     public function setUserRolesFromKernelRequest(RequestEvent $event)
     {
-        if (!$event->isMasterRequest()) {
+        if (!$event->isMainRequest()) {
             return;
         }
         if ($this->setUserRoles($event->getRequest())) {