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

[Antonioya]

Commit: b4a172fe59092b8ef96c477785e02b832e4600be
Author: Antonioya
Date:   Thu Jan 17 19:34:19 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb4a172fe59092b8ef96c477785e02b832e4600be

Merge branch 'master' into greasepencil-object

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



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