Merge branch 'blender2.8' into tmp-static-override-insertion
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 4 May 2018 13:36:06 +0000 (15:36 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 4 May 2018 13:36:06 +0000 (15:36 +0200)

Trivial merge