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