Merge branch 'MDL-31561' of git://github.com/kiklop74/moodle