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

[Antonioya]

Commit: ca6b2bdc171b83231e157731e224d38eb4ec0037
Author: Antonioya
Date:   Mon Jan 21 11:05:58 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBca6b2bdc171b83231e157731e224d38eb4ec0037

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_paint_common.py

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



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