releng for v0.9.86
Merge branch 'kazuho/issues/v0.9.84-is-broken'