Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Tue, 30 Oct 2018 23:39:20 +0000 (17:39 -0600)
committerRay Molenkamp <github@lazydodo.com>
Tue, 30 Oct 2018 23:39:20 +0000 (17:39 -0600)

Trivial merge