merge change from c826093474c2e727af7d0273a65575f70d4ed6fb

https://github.com/TheWeatherCompany/dasein-cloud-core/commit/c826093474
c2e727af7d0273a65575f70d4ed6fb#diff-0ce5821096ae100f91e3a139395f0890