bring back original line break
Automatic Py3k merge for testing