Merge branch 'MDL59980_block_bug' of git://github.com/kristian-94/moodle