Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Mon, 3 Oct 2016 20:54:22 +0000 (20:54 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Mon, 3 Oct 2016 20:54:22 +0000 (20:54 +0000)

Trivial merge