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

[Sybren A. Stüvel]

Commit: b4c01aca30faa16900084c081faff6fbaf130872
Author: Sybren A. Stüvel
Date:   Tue Jun 26 17:42:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb4c01aca30faa16900084c081faff6fbaf130872

Merge branch 'master' into blender2.8

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



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