Merge remote-tracking branch 'pa/kitkat' into kitkat