Now storing both Markdown and HTML in the database, so we get consistent rendering with the editor.
Merging changes.