Merge remote-tracking branch 'origin/master-2.0.x'

Exlusion of parsedown library in .gitignore was intentionally not
applied, as this was only added in older branches to facilitate
switching after adding the new submodule.

Conflicts
.gitignore