Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Thu, 1 Feb 2018 00:36:16 +0000 (22:36 -0200)
committerGermano <germano.costa@ig.com.br>
Thu, 1 Feb 2018 00:36:16 +0000 (22:36 -0200)

Trivial merge