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

[Campbell Barton]

Commit: 8f2acda7d72da9370f7ec3013026fadb0842cb54
Author: Campbell Barton
Date:   Sat Jun 16 16:16:53 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8f2acda7d72da9370f7ec3013026fadb0842cb54

Merge branch 'master' into blender2.8

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



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