Git merges in Moodle 3.0.9 by Dan Poltawski

commit 024f0b702a016e356bbd2cf86730894fef3e83f4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Jan 2017 18:11:26 +0800
Tag:    v3.0.9

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


commit 68529165cdce4a3446f886fe8b73a97cff01c456
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 17:49:49 +0800
Tag:    v3.0.9

Merge branch 'MDL-57677-30-usermodified' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE