Merge pull request #2586 from vlakoff/develop

Various typos and tabs adjustments