Merge branch 'MDL-39355-m' of git://github.com/andrewnicols/moodle