Upstream-commit: 56473d4cce79b0f06e46d88d14c716c1858188e2 Component: engine
Daniel Mizyrycki <daniel@dotcloud.com>