Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 31 Jan 2018 16:17:43 +0000 (17:17 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 31 Jan 2018 16:17:43 +0000 (17:17 +0100)

Trivial merge