Blender Git Loki

Merge remote-tracking branch 'upstream/master' into multiview

(removed the multiview splashscreen as well to prevent future issues and
not to increase the git repo size by much)

Conflicts:
release/datafiles/splash.png
source/blender/blenloader/intern/versioning_270.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_draw.c