Upgrade for 0.4.0.
Respect :onyx/batch-timeout.
0.4.0
Merge branch '0.4.x'