Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Fri, 4 May 2018 14:16:13 +0000 (11:16 -0300)
committerGermano <germano.costa@ig.com.br>
Fri, 4 May 2018 14:16:13 +0000 (11:16 -0300)

Trivial merge