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