Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 4 Aug 2018 11:43:10 +0000 (13:43 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 4 Aug 2018 11:43:10 +0000 (13:43 +0200)

Trivial merge