Merge branch 'develop' into weather-refactor

This commit is contained in:
Michael Teeuw
2017-10-18 12:01:44 +02:00