From upstream taska revision 7716d7516e6e0452d2cbefe577f3b37da4cf8a8c

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