Merge with 3.4.

The fix has moved in this branch.  Also, the opt-in is already available
on this branch; just set nasmDir when building.