Merge branch 'hotfix/2.0.2'
Remove line wrapping for <pre><code>
Merge branch 'hotfix/2.0.3' into develop