Git merges in Moodle 2.6.11 by Eloy Lafuente (stronk7)

commit 3ed689ccf14d18ca0823d3f920d0a9604a4f42e0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 10 May 2015 17:38:58 +0800
Tag:    v2.6.11

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