Merge fix for reindent.py