Merge "Fix the texture bleeding with wrapping in atlas" into devel/master