Adopt spaces instead of tabs to try to work around some spacing and layout issues. See comments.
Merge branch 'release-6.0.x' into barz