Merge branch 'master' into next

diff --combined parser-specs/config.spec
index 427d9fc4305cba85be3feef69c024faf1e9d6eb1,168b6a9f7b7da6d0e1bf048a294e7048a5040b4f..7538bf38047cadd4076a0c1d237d884f22a720c1
--- 1/parser-specs/config.spec
--- 2/parser-specs/config.spec
+++ b/parser-specs/config.spec
@@@ -214,7 -214,7 +214,7 @@@ state WORKSPACE_OUTPUT
        -> WORKSPACE_OUTPUT_STR
  
  state WORKSPACE_OUTPUT_STR:
-   output = string
+   output = word
        -> call cfg_workspace($workspace, $output)
  
  # ipc-socket <path>
@@@ -272,7 -272,7 +272,7 @@@ state FONT
  state BINDING:
    release = '--release'
        ->
 -  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch'
 +  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch', '$mod'
        ->
    '+'
        ->
@@@ -317,7 -317,7 +317,7 @@@ state MODE_IGNORE_LINE
  state MODE_BINDING:
    release = '--release'
        ->
 -  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch'
 +  modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch', '$mod'
        ->
    '+'
        ->