From upstream taska revision 2e1f6873b0fe69e54069b61fe8e2cb72fcdbeaa6

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