blocks: fix XML data type in gr::blocks::deinterleave
Merge branch 'master' into next