Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 6 Oct 2017 15:21:57 +0000 (12:21 -0300)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 6 Oct 2017 15:21:57 +0000 (12:21 -0300)

Trivial merge