Merge branch 'master_MDL-54575' of git://github.com/danmarsden/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Nov 2016 05:58:04 +0000 (13:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Nov 2016 05:58:04 +0000 (13:58 +0800)

Trivial merge