Merge branch 'MDL-40759-master-fix2' of http://github.com/damyon/moodle