[Update] Kiwi (2.0.6)
Merge pull request #1629 from allending/master

[Update] Kiwi (2.0.6)