Git merges in Moodle 2.2.11 by Eloy Lafuente (stronk7)

commit f5dc7f2c2a94f23a8e302638644ef8d4b07ea836
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 02 Jul 2013 05:14:36 +0800
Tag:    v2.2.11

Merge branch 'w27_MDL-39754_m22_evn26' of https://github.com/skodak/moodle into MOODLE_22_STABLE