Merge branch 'MDL-56511-master-lint' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 03:23:52 +0000 (11:23 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 03:23:52 +0000 (11:23 +0800)

Trivial merge