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

[Antonioya]

Commit: 22f1cb2121a20f9e6a6ad3a087632f5e39094edf
Author: Antonioya
Date:   Fri Dec 21 16:27:31 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB22f1cb2121a20f9e6a6ad3a087632f5e39094edf

Merge branch 'master' into greasepencil-object

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



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