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