Merge branch 'master' into blender2.8

diff --cc source/blender/editors/include/ED_transform.h
Simple merge

diff --cc source/blender/editors/include/ED_transform_snap_object_context.h
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_ruler.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_walk.c
Simple merge

diff --cc source/blender/editors/transform/transform_snap.c
Simple merge

diff --cc source/blender/editors/transform/transform_snap_object.c
Simple merge