Merge vrt of http://gnuradio.org/git/jblum.git into master