Pull @gocom's changes from master

- Render proper long code blocks (and add update tests)
- Update change log