Git merges in Moodle 2.6.9 by Eloy Lafuente (stronk7)

commit 086a9df86a5e85e044622ec4d6ae01b0804cdbf2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 07 Mar 2015 18:23:25 +0800
Tag:    v2.6.9

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