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

[Antonioya]

Commit: 039af4f45c1ffc420bcd6fa78f659dd825466889
Author: Antonioya
Date:   Tue Dec 25 11:11:09 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB039af4f45c1ffc420bcd6fa78f659dd825466889

Merge branch 'master' into greasepencil-object

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



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