Merge branch 'tracking-snowball-fixes-13.03' into merge-linux-linaro