Merge remote-tracking branch 'rmk/fixes' into linaro-3.0