ENH: detabified (assuming tab width 8) few places in favor of 4 spaces for consistency
Merge remote-tracking branch 'otherpullrequest/master'

Upstream does not reply communication. Merging other pull requests not merged by upstream.
detabified my changes