Blender Git Loki

Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/gpu/intern/gpu_draw.c
# source/blender/gpu/shaders/gpu_shader_material.glsl
# source/blender/makesdna/DNA_view3d_types.h
# source/blender/nodes/shader/nodes/node_shader_normal_map.c
# source/blender/nodes/shader/nodes/node_shader_tex_environment.c
# source/blender/nodes/shader/nodes/node_shader_tex_image.c
# source/blender/nodes/shader/nodes/node_shader_tex_noise.c
# source/blender/nodes/shader/nodes/node_shader_texture.c