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