7.3 r9
Merge pull request #36 from Gethe/Nib-Updates

7.3 r9