refactor
Merge branch 'v0.8' of github.com:turlicht/Scenery into v0.8
refactor