Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Sat, 2 Jun 2018 18:34:25 +0000 (20:34 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Sat, 2 Jun 2018 18:34:25 +0000 (20:34 +0200)

Trivial merge