Git merges in Moodle 2.7.5 by David Monllao

commit 1ffc4059365b3fa5eb2ee40f057522b070e2283f
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 28 Jan 2015 17:45:01 +0800
Tag:    v2.7.5

Merge branch 'MDL-48914-27' of git://github.com/rtcn2/moodle into MOODLE_27_STABLE


commit a56ec068ede648759013890431dec5e2d6394313
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 20 Jan 2015 17:09:17 +0800
Tag:    v2.7.5

Merge branch 'MDL-48765-27' of git://github.com/gurgus/moodle into MOODLE_27_STABLE


commit 39922f80298763083d1afbefe882079f5883ec87
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 20 Jan 2015 16:08:06 +0800
Tag:    v2.7.5

Merge branch 'MDL-48776-27' of git://github.com/gurgus/moodle into MOODLE_27_STABLE