Do not unfragment some code examples
Merge branch 'master' into gh-pages