Merge branch '5.2-dev' into save_categoery_menu

Author: brianteeman

.php-cs-fixer.dist.php

@@ -61,6 +61,7 @@
 
 $config = new PhpCsFixer\Config();
 $config
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRiskyAllowed(true)
     ->setHideProgress(false)
     ->setUsingCache(false)

libraries/src/Router/SiteRouter.php

@@ -309,6 +309,12 @@ public function parseRawRoute(&$router, &$uri)
             $item = $this->menu->getItem($uri->getVar('Itemid'));
         } else {
             $item = $this->menu->getDefault($this->app->getLanguage()->getTag());
+
+            if ($item->query['option'] !== $uri->getVar('option', $item->query['option'])) {
+                // Set the active menu item
+                $this->menu->setActive($item->id);
+                $item = false;
+            }
         }
 
         if ($item && $item->type === 'alias') {