Merge remote-tracking branch 'jnovack/markdown'