re-sync c.c to kevinlawler/kona