No longer dissolves.
Merge branch 'master' of git@github.com:efruchter/Trait