upstream/0.6.0
5e10be25 · Upgraded to fresh upstream 0.6.0 ·