Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Dec 2018 14:15:06 +0000 (15:15 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Dec 2018 14:15:06 +0000 (15:15 +0100)

Trivial merge