Allow users to opt out of the markup-fix for whitespace. Thanks to
@kevva
Merge branch 'dev'