Merge remote-tracking branch 'origin' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Mon, 16 Apr 2018 07:59:52 +0000 (09:59 +0200)
committerGaia Clary <gaia.clary@machinimatrix.org>
Mon, 16 Apr 2018 07:59:52 +0000 (09:59 +0200)

Trivial merge