Taska upstream c8cbecf0608de3448a488ecd6ba228c50a2b46fc

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