Rebase from master

parse.go

@@ -46,9 +46,8 @@ func parseIter(set *flag.FlagSet, ip iterativeParser, args []string, shellComple
 				return err
 			}
 
-			// Start processing only from failed argument and not
-			// from beginning
-			args = append(shortOpts, args[i+1:]...)
+			// swap current argument with the split version
+			args = append(args[:i], append(shortOpts, args[i+1:]...)...)
 			argsWereSplit = true
 			break
 		}