Code example result not corresponding to actual code example
Fix error with unmatching tags in code example
Merging 'master' into 'gh-pages'