Merge branch 'master' into piweather-sources
Fixed error handling in ip view
Merge branch 'piweather-sources'