From upstream taska revision 9157853987802990e0eb99f07286a083ef45106c

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