From upstream taska revision 121591cdbdbd075dc8cf8987db3089c444009345

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