HBelusca
committed
on 14 Jul
Sync with trunk r75344 to get the inflib stuff in place.