Merge pull request #3007 from vlidholt/fixweather

Fixes the broken Weather demo