Merge remote-tracking branch 'origin/master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Fri, 20 Apr 2018 13:13:06 +0000 (15:13 +0200)
committerGaia Clary <gaia.clary@machinimatrix.org>
Fri, 20 Apr 2018 13:13:06 +0000 (15:13 +0200)

Trivial merge