Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 12 Jul 2017 09:49:43 +0000 (11:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 12 Jul 2017 09:49:43 +0000 (11:49 +0200)

Trivial merge