Merge branch 'MDL-56731_master' of https://github.com/tonynlin/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Nov 2016 02:44:32 +0000 (10:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Nov 2016 02:44:32 +0000 (10:44 +0800)

Trivial merge