Taska upstream 00ac700fef2b330692611abf9cc71241ad57f8e4

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