Merge branch 'release/v0.2.1' into develop
Merge branch 'master' into develop
Move editor dependent lines out of docsparser