Upstream-commit: 24ddfe3f25f99db5a23f62d411c949b2236288a1 Component: engine
Solomon Hykes <solomon@dotcloud.com>