Merge branch 'MDL-70897-master' of git://github.com/kabalin/moodle