Note sapling code probably has other places where that kind of issues may happen,
would need a full recheck, but that's outside of scope of basic bugfix.

Patch by mangostaniko (Nikolaus Leopold) with minor changes, thanks!

Revision: D844