Blender Git Loki

Merge branch 'master' into HMD_viewport

Conflicts:
release/scripts/startup/bl_ui/properties_data_camera.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesdna/DNA_camera_types.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_operators.c