Merge branch 'wip/sync' of http://gnuradio.org/git/jcorgan into sync