Fixes and merging NPTf
Fixes for both NPTf and NPTi
Fixes in NPTi migrated into NPTf
*** empty log message ***
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.