Minor safety refactoring, testing organizeHierarchy
merge master into brozek
Merge branch 'brozek'
Merge branch 'master' of https://github.com/ombozek/Team-TBA