Merge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle