Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Tue, 14 Aug 2018 14:00:49 +0000 (08:00 -0600)
committerRay Molenkamp <github@lazydodo.com>
Tue, 14 Aug 2018 14:00:49 +0000 (08:00 -0600)

Trivial merge