new home dir triffe -> tim could break stuff
Merge remote-tracking branch 'origin/master'
.