Fix white space and line-ending issues introduced in #724
Merge branch 'master' into twoCrashes
Changes after review.