Blender Git Loki

Merge branch 'master' into greasepencil-object

Conflicts:
release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
release/scripts/startup/bl_ui/properties_paint_common.py
release/scripts/startup/bl_ui/space_topbar.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py

This commit has broken all new graese pencil Vertex Paint, Sculpt mode
and Weight mode and need a review.