Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle