no conflict
Merge pull request #4218 from paprka/binaryshit

Sec sprite update, no conflict edition