Merge branch 'MDL-59922-master-on-int' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 19 Sep 2017 08:38:08 +0000 (16:38 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 19 Sep 2017 08:38:08 +0000 (16:38 +0800)

Trivial merge