Correcting NonnegativeFactorization when smaller rank approximations are requested.
Merge remote-tracking branch 'upstream/development' into portable