From upstream taska revision 17d73f25165afd4974d5816073767c4f37cc48bd

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