Merge branch 'MDL-30961-master' of git://github.com/mouneyrac/moodle