Merge commit 'v3.0.2' into linaro-3.0