Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 7 Jun 2017 09:38:03 +0000 (11:38 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 7 Jun 2017 09:38:03 +0000 (11:38 +0200)

Trivial merge