Minor changes
Merge commit 'ad853089cb09cc0d5d4ff062549fbcae7bfb433e'
Reverting tabs->spaces conversion.
Removing obsolete configuration options.