more partial function optimization
Merge remote-tracking branch 'origin/master' into xna-dev