Merge branch 'MDL-46064_master' of git://github.com/markn86/moodle