Merge "Texel align text when scrolling and linear sampling" into devel/master