From upstream taska revision b6d379a8d995371a9e92e9d901e458e61f603a58

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