Leave whitespace alone.
Remove style from code tags
Merge remote-tracking branch 'upstream/master'