Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Tue, 17 Apr 2018 15:36:39 +0000 (17:36 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 17 Apr 2018 15:36:39 +0000 (17:36 +0200)

Trivial merge