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