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