Temporary fix for weird memory crash in Kiwi.

See: https://github.com/allending/Kiwi/issues/438
Merge branch 'refs/heads/master-upstream'