Merge branch 'MDL-56682_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 05:56:08 +0000 (13:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 05:56:08 +0000 (13:56 +0800)

Trivial merge