From upstream taska revision 97b462fd1053e366225e650647dce4625f1f48e4

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