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

[Antonioya]

Commit: 60cd64fe2e5653074621d03dfca0df61250beacc
Author: Antonioya
Date:   Wed Jan 9 16:44:38 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB60cd64fe2e5653074621d03dfca0df61250beacc

Merge branch 'master' into greasepencil-object

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



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