Git commits in Moodle 2.6.10 by Marina Glancy

commit 9be5b22718cea237e7c9140c6a90d8f81029fd1d
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Mar 2015 11:19:59 +0800
Tag:    v2.6.10

MDL-49418 core: partial revert of MDL-48804