From upstream taska revision 832c7619d05f250f80afa59a1df9dc10ae4ec21b

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