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

[Campbell Barton]

Commit: 6a64556ba1c82f1f9378989f87b58abc1540da12
Author: Campbell Barton
Date:   Fri May 18 15:31:53 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6a64556ba1c82f1f9378989f87b58abc1540da12

Merge branch 'master' into blender2.8

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



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