merge pull request from wuxian revert by github

Change-Id: Icc69c35c8155843619eaafe377761498b2ca625d
upgrade to 0.9.4

Change-Id: I9ca555eb0f48566f9223eac05c1d916b00a42cba