Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 13 Sep 2018 09:27:38 +0000 (11:27 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 13 Sep 2018 09:27:38 +0000 (11:27 +0200)

Trivial merge