Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 20 Apr 2018 09:01:29 +0000 (11:01 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 20 Apr 2018 09:01:29 +0000 (11:01 +0200)

Trivial merge