Merge branches 'html5' and 'document-path' into grimoire-patched