Merge branch 'blender2.7'
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 25 Mar 2019 09:46:20 +0000 (10:46 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 25 Mar 2019 09:46:20 +0000 (10:46 +0100)

Trivial merge