Reformatting with 4-space tabs
Merge origin/smessner into smessner