Merge branch 'MDL-60182_master' of https://github.com/nadavkav/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 11:29:52 +0000 (13:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 11:29:52 +0000 (13:29 +0200)

Trivial merge