Merge branch 'MDL-57858-master' of git://github.com/pavelsokolov/moodle