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