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

[Campbell Barton]

Commit: 486ff7e52c031e257f4044ccbc2cdafb807cce32
Author: Campbell Barton
Date:   Thu May 17 19:55:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB486ff7e52c031e257f4044ccbc2cdafb807cce32

Merge branch 'master' into blender2.8

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



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