Fixed whitespace issues
Merge branch 'maint-2.4.2'