Merge remote-tracking branch 'origin/markdown-up'
Merge branch 'develop'
Added instructions for fetching the PHP Markdown submodule
Merge branch 'master' into develop