Conflicts: source/blender/blenlib/BLI_math_matrix.h source/blender/blenlib/intern/math_matrix.c source/blender/blenlib/intern/rand.c source/blender/editors/animation/anim_channels_edit.c source/blender/makesrna/intern/rna_mask.c
Conflicts: source/blender/blenlib/BLI_math_matrix.h source/blender/blenlib/intern/math_matrix.c source/blender/blenlib/intern/rand.c source/blender/editors/animation/anim_channels_edit.c source/blender/makesrna/intern/rna_mask.c