sprite fixes
Merge remote-tracking branch 'origin/Sprite' into TimBranch
merge sprite fixes