[Bf-blender-cvs] [00b5bda6ae8] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonioya]

Commit: 00b5bda6ae8ed85838ba1e3c767151d22f1254f8
Author: Antonioya
Date:   Tue Jul 9 23:23:26 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB00b5bda6ae8ed85838ba1e3c767151d22f1254f8

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/datafiles/locale
	release/scripts/addons
	release/scripts/addons_contrib
	source/tools

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



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