Merge commit 'v3.0.3' into linaro-3.0