Use sippy_cup's develop branch