From upstream taska revision 0b2d5fcc0bb90f885c4b269dbb1d65b6914cddcd

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