Git merges in Moodle 2.8.3 by David Monllao

commit 43439ea041f61ee6e6df38e8202e0c925189c43b
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 28 Jan 2015 17:44:49 +0800
Tag:    v2.8.3

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


commit e31f7ac7b9369a0039b74ad1a93f1bb2e49ef82e
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 20 Jan 2015 17:08:57 +0800
Tag:    v2.8.3

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


commit f3b0ba7c8fddbb134f2f96077e9fedbbcabaf772
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 20 Jan 2015 16:07:54 +0800
Tag:    v2.8.3

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