Merge branch 'blender2.8' into tmp-static-override-insertion
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 3 May 2018 11:51:42 +0000 (13:51 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 3 May 2018 11:51:42 +0000 (13:51 +0200)

Trivial merge