Merge pull request #848 from tobiasd/20190424-curweather