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

[Sybren A. Stüvel]

Commit: 99c6601a1ffe744ef8592de5da5920156a1097a6
Author: Sybren A. Stüvel
Date:   Tue May 23 17:35:45 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB99c6601a1ffe744ef8592de5da5920156a1097a6

Merge branch 'master' into blender2.8

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



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