[Bf-blender-cvs] [8b849f39e8b] master: Merge branch 'blender-v2.83-release'

[Bastien Montagne]

Commit: 8b849f39e8bbfd02f24bbcbc7874081fc3c37f06
Author: Bastien Montagne
Date:   Mon May 25 15:43:54 2020 +0200
Branches: master
https://developer.blender.org/rB8b849f39e8bbfd02f24bbcbc7874081fc3c37f06

Merge branch 'blender-v2.83-release'

Conflicts:
	source/blender/blenkernel/intern/lib_id.c

===================================================================



===================================================================