Merge branch 's11_MDL-27976_undefined_variable_master' of github.com:dongsheng/moodle