Blender Git Commit Log

Merge branch 'master' into soc-2016-layer_manager

And make manual adjustments of merged parts to fit changes in branch.
Conflicts:
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/object.c
source/blender/editors/animation/anim_filter.c