Merge branch 'blender2.7'
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 24 Jan 2019 15:16:05 +0000 (16:16 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 24 Jan 2019 15:16:05 +0000 (16:16 +0100)

Trivial merge