Cleaned up indentation
Merge branch 'master' into mtaylor