Package upstream 4.0.4

Fixes #1