From upstream taska 0b03ece4e75b351a3cfaca927cf1ba2ea72286e7

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