Merge branch 'w49_MDL-30517_m22_blockdelete' of git://github.com/skodak/moodle