Cylinder + Circle
Merge branch 'master' of https://github.com/tgrochow/scene