Blender Git Loki

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

# Conflicts:
# release/datafiles/splash.png
# release/datafiles/splash_2x.png
# source/blender/gpu/GPU_material.h
# source/blender/gpu/shaders/gpu_shader_material.glsl
# source/blender/makesrna/intern/rna_image_api.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
# source/blender/nodes/shader/nodes/node_shader_fresnel.c
# source/blender/nodes/shader/nodes/node_shader_layer_weight.c
# source/blender/nodes/shader/nodes/node_shader_normal_map.c