Taska upstream 938b4489e3b32e48a6699f10376fe607f261c68b

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