Merge branch 'patches/dward' of git@gnuradio.org:jcorgan