Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 5 Dec 2017 21:38:13 +0000 (22:38 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 5 Dec 2017 21:38:13 +0000 (22:38 +0100)

Trivial merge