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