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