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

[Campbell Barton]

Commit: 351c6d434671978df1d1cc4d5a295da385e5d4b3
Author: Campbell Barton
Date:   Mon May 21 10:40:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB351c6d434671978df1d1cc4d5a295da385e5d4b3

Merge branch 'master' into blender2.8

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



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