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