Git merges in Moodle 2.6.8 by Eloy Lafuente (stronk7)

commit 23c00f5706b20a678af064ea48b681e6ba536588
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 30 Jan 2015 19:34:51 +0800
Tag:    v2.6.8

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