Update to 0.1.99.4
Merge remote-tracking branch 'upstream/kaji' into kaji