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

[Campbell Barton]

Commit: eeab3563d7409409a70bfdd4fcdb4ddfee428af3
Author: Campbell Barton
Date:   Fri May 4 08:02:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBeeab3563d7409409a70bfdd4fcdb4ddfee428af3

Merge branch 'master' into blender2.8

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



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