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