Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 14 Jul 2017 12:34:46 +0000 (14:34 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 14 Jul 2017 12:34:46 +0000 (14:34 +0200)

Trivial merge