[Bf-blender-cvs] [2408a482c03] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 2408a482c032e4df9c091f9fa854785bb08963b3
Author: Bastien Montagne
Date:   Tue Apr 17 12:12:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2408a482c032e4df9c091f9fa854785bb08963b3

Merge branch 'master' into blender2.8

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



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