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