Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle