From upstream taska revision 9970fde3fdf30eaa21a4e8aa3ae2da9fa0b593af

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