[Update] KIF-next (2.0.0pre5)
Merge pull request #3710 from bnickel/master

[Update] KIF-next (2.0.0pre5)