Git merges in Moodle 3.0.2 by Eloy Lafuente (stronk7)

commit 24a7fc2f079963fb27a7ef9d4d2c43e9c7dc0833
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 23 Dec 2015 00:13:58 +0800
Tag:    v3.0.2

Merge branch 'MDL-49743-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE


commit 6f6ef56253410782c3cbf215a27a097a232be583
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 22 Dec 2015 20:13:58 +0800
Tag:    v3.0.2

Merge branch 'MDL-51719-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE