Merge branch 'w04_MDL-26045_20_onlineblock' of git://github.com/skodak/moodle