Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle