[Bf-blender-cvs] [2b17ee6cd47] soc-2019-npr: Merge remote-tracking branch 'origin/master' into soc-2019-npr

[YimingWu]

Commit: 2b17ee6cd47510bc131b85cfdba55254011b3aff
Author: YimingWu
Date:   Wed Jul 17 20:03:31 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB2b17ee6cd47510bc131b85cfdba55254011b3aff

Merge remote-tracking branch 'origin/master' into soc-2019-npr

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



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