Blender Git Loki

Merge branch 'master' into HMD_viewport

Conflicts:
intern/ghost/intern/GHOST_System.cpp
intern/ghost/intern/GHOST_System.h
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/versioning_270.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt