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

[Campbell Barton]

Commit: 97e7d9f90b31a0ede58e123bfec35d7fb1f913d4
Author: Campbell Barton
Date:   Fri Jun 8 14:57:17 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB97e7d9f90b31a0ede58e123bfec35d7fb1f913d4

Merge branch 'master' into blender2.8

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



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