Fix some code block formatting issues.
Merge branch 'master' into structure

* master:
  Fix some code block formatting issues.