Blender Git Loki

Merge branch 'master' into soc-2016-layer_manager

Conflicts:
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenloader/intern/versioning_270.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_smoke.c