Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 25 Apr 2018 08:39:51 +0000 (10:39 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 25 Apr 2018 08:39:51 +0000 (10:39 +0200)

Trivial merge