Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle