Merge branch 'master' into help_categories

Author: tleonhardt

cmd2.py

@@ -1354,13 +1354,13 @@ def tokens_for_completion(self, line, begidx, endidx):
                     raw_tokens.append(cur_initial_token)
                     continue
 
-                # Keep track of the current token we are building
-                cur_raw_token = ''
-
                 # Iterate over each character in this token
                 cur_index = 0
                 cur_char = cur_initial_token[cur_index]
 
+                # Keep track of the token we are building
+                cur_raw_token = ''
+
                 while True:
                     if cur_char not in REDIRECTION_CHARS: