Conflicts: source/blender/blenkernel/BKE_anim.h source/blender/blenkernel/intern/anim.c source/blender/blenkernel/intern/scene.c source/blender/editors/armature/pose_edit.c source/blender/editors/armature/pose_transform.c source/blender/editors/armature/pose_utils.c source/blender/editors/include/ED_armature.h source/blender/editors/object/object_edit.c source/blender/editors/transform/transform_conversions.c