Merge commit '25a8' from git@gnuradio.org:jblum