squash to couch_changes update

bedcfba0292dbafcd480325f2ec48321de24ab99