Git merges in Moodle 2.6.7 by Eloy Lafuente (stronk7)

commit 31f46692302ae6042e0e45e14f902db3cabba21c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 10 Jan 2015 20:12:30 +0800
Tag:    v2.6.7

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


commit 505f67520f0583ea657d83c2eb8d5243c9a3572a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 Jan 2015 00:24:48 +0800
Tag:    v2.6.7

Merge branch 'MDL-48748-26-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE