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