(Start of converting sprites to have nb values too)
Merge remote-tracking branch 'origin/ReleaseBuilds' into Zargy