Merge branch 'master' into menuaction

diff --cc shell_integration/dolphin/ownclouddolphinactionplugin.cpp
index c8f9185867942ce86cb62e9258d1f8e600aac2fb,992e14b815049263ac77fe16ac0d72866aa7bb02..4e5966e7fd8fe978b67d674b987d5bc3ba8e3589
--- 1/shell_integration/dolphin/ownclouddolphinactionplugin.cpp
--- 2/shell_integration/dolphin/ownclouddolphinactionplugin.cpp
+++ b/shell_integration/dolphin/ownclouddolphinactionplugin.cpp
@@@ -90,9 -90,12 +90,10 @@@ public
              delete menu;
              return {};
          }
--
 -        auto menuaction = new QAction(parentWidget);
 -        menuaction->setText(helper->contextMenuTitle());
 -        menuaction->setIcon(QIcon::fromTheme(helper->contextMenuIconName()));
 -        menuaction->setMenu(menu);
 -        return { menuaction };
++        
 +        menu->setTitle(helper->contextMenuTitle());
++        menu->setIcon(QIcon::fromTheme(helper->contextMenuIconName()));
 +        return { menu->menuAction() };
      }