der
Merge remote-tracking branch 'origin/kitkat' into port_omni