Merge branch 'master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Tue, 27 Feb 2018 20:06:29 +0000 (21:06 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Tue, 27 Feb 2018 20:06:29 +0000 (21:06 +0100)

Trivial merge