Merge branch 'MDL59980_block_bug' of git://github.com/kristian-94/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 13 Jun 2018 02:00:00 +0000 (10:00 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 13 Jun 2018 02:00:00 +0000 (10:00 +0800)

Trivial merge