Merge branch 'MDL-56690-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Nov 2016 06:25:18 +0000 (14:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:40 +0000 (09:07 +0000)

Trivial merge