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

[Campbell Barton]

Commit: a3e74acd9ee2879898389cb9d33950f44494932e
Author: Campbell Barton
Date:   Sun May 6 18:35:39 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa3e74acd9ee2879898389cb9d33950f44494932e

Merge branch 'master' into blender2.8

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



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