Merge branch 'master' into 0.6
Merge branch 'master' into 0.6
ChangeLog.md: Fix Markdown links