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