Merge branch 'lo_fix' from http://gnuradio.org/git/jblum.git into master