Sync cedarish version
Import fixes from deis