[Bf-blender-cvs] [9b338e80280] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Sybren A. Stüvel]

Commit: 9b338e802805bb7dbf981512923d6a1f343fbaa8
Author: Sybren A. Stüvel
Date:   Wed Apr 18 12:27:31 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9b338e802805bb7dbf981512923d6a1f343fbaa8

Merge remote-tracking branch 'origin/master' into blender2.8

Explicitly undoing 287d1924fa149f0 here, as that was a master-only change.

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



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