Merge branch 'w05_MDL-26104_20_blockconflick' of git://github.com/skodak/moodle