Git merges in Moodle 2.1.8 by Aparup Banerjee

commit 56f9e592417e5c7748f3be7255656a9d2590c832
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Thu, 26 Jul 2012 14:04:26 +0800
Tag:    v2.1.8

Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE

commit b693256a99db59768964ee60985df116f348d72a
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Tue, 24 Jul 2012 11:18:59 +0800
Tag:    v2.1.8

Merge branch 'wip-mdl-33159-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE