[Bf-blender-cvs] [9a9ecad65f1] master: Merge branch 'blender-v2.83-release'

[Bastien Montagne]

Commit: 9a9ecad65f1f1dbb2299b8663bb1cc54e99c423c
Author: Bastien Montagne
Date:   Wed Apr 29 10:57:47 2020 +0200
Branches: master
https://developer.blender.org/rB9a9ecad65f1f1dbb2299b8663bb1cc54e99c423c

Merge branch 'blender-v2.83-release'

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

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



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