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

[Campbell Barton]

Commit: 2451a1951e22fd7761f7e39ededda0bd5cc2d875
Author: Campbell Barton
Date:   Fri May 18 11:02:39 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2451a1951e22fd7761f7e39ededda0bd5cc2d875

Merge branch 'master' into blender2.8

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



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