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