Merge branch 'refs/heads/master' into markdown
Merge remote-tracking branch 'origin/markdown'