Merge branches 'mdw/doc-reorg' and 'mdw/parser-fixes'