Cif comment 'bug'fix
Don't interpret # immediately following non-whitespace as comment
characters in cifs. Because some people think that using # signs in
their site labels is a good idea
Automatic Py3k merge for testing