Add fix for bug 373

Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Merge remote-tracking branch 'linaro/master'