Backport patches fixing crash in 0.9.6
Merge pull request #97 from uzytkownik/master

dev-libs/folks: Backport patches fixing crash in 0.9.6