Merge branch 'fix/wxgui' of git@gnuradio.org:jblum