Blender Git Loki

Merge remote-tracking branch 'refs/remotes/origin/blender-v2.74-release' into fracture_modifier

Conflicts:
intern/cycles/render/scene.cpp
release/datafiles/blender_icons.svg
release/datafiles/blender_icons16/icon16_mod_data_transfer.dat
release/datafiles/blender_icons32/icon32_mod_data_transfer.dat
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_data_transfer.h
source/blender/blenkernel/BKE_mesh_remap.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/data_transfer.c
source/blender/blenkernel/intern/data_transfer_intern.h
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/mesh_mapping.c
source/blender/blenkernel/intern/mesh_remap.c
source/blender/blenkernel/intern/object.c
source/blender/editors/include/UI_icons.h
source/blender/editors/object/object_data_transfer.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_datatransfer.c
source/blender/modifiers/intern/MOD_util.c