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