Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Fri, 5 Oct 2018 03:57:00 +0000 (21:57 -0600)
committerRay Molenkamp <github@lazydodo.com>
Fri, 5 Oct 2018 03:57:00 +0000 (21:57 -0600)

Trivial merge