Git merges in Moodle 2.5.7 by Eloy Lafuente (stronk7)

commit 85c553a0bb78cfad46e0ccd5329ef3fea4108853
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 29 May 2014 18:51:20 +0800
Tag:    v2.5.7

Merge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_25_STABLE


commit a13a12f68ffb858778b1a99ac664dad79804584e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 22 May 2014 22:46:57 +0800
Tag:    v2.5.7

Merge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_25_STABLE


commit d3e6508d5b1d2600b6906c466913c252f1900541
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 22 May 2014 06:07:08 +0800
Tag:    v2.5.7

Merge branch '44711-25-r3' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE