Drowning death and adjustment to mushroom;
Merge branch 'master' of https://github.com/ifdm/siphon
Trella drowns in 1.3.1;