Merge branch 'develop' of https://github.com/mermaid-js/mermaid into …

Merge branch 'develop' of https://github.com/mermaid-js/mermaid into … #1941