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