Merge branch 'MDL-35978-master-blockfix' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 03:43:38 +0000 (11:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 03:43:38 +0000 (11:43 +0800)

Trivial merge