Reindent to 2 spaces in preparation for merge into 3.0