Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 1 Aug 2018 14:13:13 +0000 (16:13 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 1 Aug 2018 14:13:13 +0000 (16:13 +0200)

Trivial merge