Merge pull request  from KylinMod/kitkat …