Merge branch 'MDL-28406_block_duplicate' of git://github.com/andyjdavis/moodle