Merge branch 'sync' from http://gnuradio.org/git/trondeau.git into master