Sync jfltevzw
Merge pull request #1 from willdeberry/kitkat

Sync jfltevzw