Merge remote-tracking branch 'liquid/kitkat' into ose