Merge branch 'digital' of vps.gnuradio.org:trondeau into digital