From upstream taska revision fd36fa464c86db9d574e170a4bb0f86d8cb09b56

Signed-off-by: Alex Gonzalez <alex@lindusembedded.com>