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