merged -r5966:6112 on trondeau/ofdm_mod. Allows for generic constellations (supports...