Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 May 2018 09:15:31 +0000 (11:15 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 May 2018 09:15:31 +0000 (11:15 +0200)

Trivial merge