bring up to date with master. liveblog style fixes
Merge-o-matic