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

[Campbell Barton]

Commit: 541258bfa60e90ff6c0b89ed2972963a9f53db86
Author: Campbell Barton
Date:   Sun May 6 16:00:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB541258bfa60e90ff6c0b89ed2972963a9f53db86

Merge branch 'master' into blender2.8

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



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