Merge branch 'todo_wiki_upgrade_master' of git://github.com/stronk7/moodle