Merge commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b' * commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b': Fix x offset for boxed textures
Merge commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b' * commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b': Fix x offset for boxed textures