Fixed inconsistent use of tabs in the file. Only spaces are used now.
Merge branch '4.2'