From upstream taska revision 194c9355e80f541531ce3793387a8bd45099ebbb

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