From upstream taska revision ce747f0f259f29897337a89e063431adf4d195b1

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