upstream/0.5.4
f46eed21 · Upgraded to fresh upstream 0.5.4 ·