Merge branch 'm20_MDL-22449_wiki_help_buttons' of git://github.com/dongsheng/moodle