Git commits in Moodle 2.8.5 by Marina Glancy

commit 2d73956d8e88d9f2e5587d1a197a8f01301a4aca
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 09 Mar 2015 11:26:18 +0800
Tag:    v2.8.5

MDL-49418 core: partial revert of MDL-48804