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

[Antonioya]

Commit: d337a3993b4d37685f8f4f72be921a47f61e3a6b
Author: Antonioya
Date:   Thu Jan 3 20:14:33 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd337a3993b4d37685f8f4f72be921a47f61e3a6b

Merge branch 'master' into greasepencil-object

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



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