Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 11 May 2017 14:11:02 +0000 (16:11 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 11 May 2017 14:11:02 +0000 (16:11 +0200)

Trivial merge