[Bf-blender-cvs] [11130970c6a] blender2.8: Merge commit 'origin/master^' into blender2.8

[Dalai Felinto]

Commit: 11130970c6a3ff14cb4dd0caece2137891b43e87
Author: Dalai Felinto
Date:   Thu Mar 29 10:36:01 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB11130970c6a3ff14cb4dd0caece2137891b43e87

Merge commit 'origin/master^' into blender2.8

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



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