Git commits in Moodle 2.3.6 by Aparup Banerjee

commit 218e485ff5d1db8c68b1e4b4619edf96541b6475
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 14 Mar 2013 11:05:11 +0800
Tag:    v2.3.6

Revert "Merge branch 'MDL-38356-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE"