merge upstream changes

compatibility with latest casein-core upstream changes
Ref #2
Ref TheWeatherCompany/dasein-cloud-core#42