Backport master fixes, additional fixes + GLSL 1.5 texture shader