Merged r4518:5130 from developer branch n4hy/ofdm into trunk, passes distcheck.