Merge branch 'master' into next

diff --combined parser-specs/commands.spec
index 100e5f4ede2d7d6d4c75b34c0fcd18fb756b7c6f,b0fb9e0118a4e0f462a10c762d6891864da8a97b..b416d9680dfbfb2a48b248975fa376d17be6f752
--- 1/parser-specs/commands.spec
--- 2/parser-specs/commands.spec
+++ b/parser-specs/commands.spec
@@@ -130,7 -130,7 +130,7 @@@ state FULLSCREEN
  
  # split v|h|vertical|horizontal
  state SPLIT:
-   direction = 'v', 'h', 'vertical', 'horizontal'
+   direction = 'horizontal', 'vertical', 'v', 'h'
        -> call cmd_split($direction)
  
  # floating enable|disable|toggle
@@@ -190,7 -190,7 +190,7 @@@ state RENAME_WORKSPACE_TO
        -> call cmd_rename_workspace($old_name, $new_name)
  
  # move <direction> [<pixels> [px]]
 -# move [window|container] [to] workspace <str>
 +# move [window|container] [to] workspace [<str>|next|prev|current]
  # move [window|container] [to] output <str>
  # move [window|container] [to] scratchpad
  # move workspace to [output] <str>
@@@ -231,7 -231,7 +231,7 @@@ state MOVE_DIRECTION_PX
  state MOVE_WORKSPACE:
    'to'
        -> MOVE_WORKSPACE_TO_OUTPUT
 -  workspace = 'next', 'prev', 'next_on_output', 'prev_on_output'
 +  workspace = 'next', 'prev', 'next_on_output', 'prev_on_output', 'current'
        -> call cmd_move_con_to_workspace($workspace)
    'number'
        -> MOVE_WORKSPACE_NUMBER