Merge branch 'MDL-55133-master' of git://github.com/damyon/moodle