Merge remote-tracking branch 'origin/blender2.8' into render-layers
authorDalai Felinto <dfelinto@gmail.com>
Tue, 20 Dec 2016 09:58:10 +0000 (10:58 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 20 Dec 2016 09:58:10 +0000 (10:58 +0100)

Trivial merge