Add more ff to strip whitespace
Merge branch 'master' into macosx