Merge branch 'MDL-33509-master' of git://github.com/mihailges/moodle