Merge branch 'MDL-37390-master' of git://github.com/sarjona/moodle