Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 24 Nov 2017 09:58:28 +0000 (10:58 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 24 Nov 2017 09:58:28 +0000 (10:58 +0100)

Trivial merge