Traits refactor#85

brainstorm wants to merge 15 commits intomainbrainstorm/ssh-stamp:mainfrom

traits_refactorbrainstorm/ssh-stamp:traits_refactorCopy head branch name to clipboard