Merge branch 'wip/grc/cleanup' of http://gnuradio.org/git/jblum