Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 19 Jan 2018 19:06:32 +0000 (17:06 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 19 Jan 2018 19:06:32 +0000 (17:06 -0200)

Trivial merge