You may have to regenerate the sprites after merging master in.