Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorGermano <germano.costa@ig.com.br>
Sat, 13 Jan 2018 03:13:37 +0000 (01:13 -0200)
committerGermano <germano.costa@ig.com.br>
Sat, 13 Jan 2018 03:13:37 +0000 (01:13 -0200)

Trivial merge