Merge branch 'master' into dev

# Conflicts:
#	source/forms/ScpCommander.dfm
#	source/forms/ScpExplorer.dfm

Source commit: bceecfa842954d0728cff8b2194d8c36c9091638

source/forms/ScpCommander.dfm

@@ -411,7 +411,7 @@ inherited ScpCommanderForm: TScpCommanderForm
       end
       object TBXSubmenuItem29: TTBXSubmenuItem
         Caption = '&Tabs'
-        HelpKeyword = 'ui_commander_menu#tab'
+        HelpKeyword = 'ui_commander_menu#tabs'
         Hint = 'Tab commands'
         object TBXSubmenuItem30: TTBXSubmenuItem
           Action = NonVisualDataModule.NewTabAction

source/forms/ScpExplorer.dfm

@@ -288,7 +288,7 @@ inherited ScpExplorerForm: TScpExplorerForm
       end
       object TBXSubmenuItem29: TTBXSubmenuItem
         Caption = '&Tabs'
-        HelpKeyword = 'ui_explorer_menu#tab'
+        HelpKeyword = 'ui_explorer_menu#tabs'
         Hint = 'Tab commands'
         object TBXItem113: TTBXItem
           Action = NonVisualDataModule.NewTabAction