[Update] Kiwi (2.0.5)
Merge pull request #1306 from allending/master

[Update] Kiwi (2.0.5)