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