Unified squashed result of google merge.#1986

wiseoldduck wants to merge 1 commit intoTextureGroup:masterTextureGroup/Texture:masterfrom

wiseoldduck:google_prwiseoldduck/Texture:google_prCopy head branch name to clipboard