Merge utils from http://gnuradio.org/git/trondeau.git