Fixed taps to coincide with CHDL updates.
Merge remote-tracking branch 'upstream/master'