BUG fix - incorrect calculation of required N-uptake
Merge remote-tracking branch 'upstream/newstrata' into xiaoli