Merge branch 'MDL-30852-master' of git://github.com/damyon/moodle