Merge branch 'head' into kitkat