Implemented @WestLangley for normalMap + envMap case. Fixes #4517.
Updated builds.