Merge branch 'MDL-60516-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Oct 2017 13:16:21 +0000 (15:16 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Oct 2017 13:16:21 +0000 (15:16 +0200)

Trivial merge