Merge branch 'MDL-66354-master' of http://github.com/dravek/moodle