Don't trim whitespace in folder names (#1488955)
Bump version number up to 6.2