Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle