Merge branch 'MDL-36433-master' of git://github.com/itamart/moodle