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