Fix for Python 2.6 (re shlex.split()). All tests pass