Merge branch 'MDL-58581-master-take2' of https://github.com/lucaboesch/moodle