Local update
Merge branch 'master' into zunda-local
Fix a test case

cloudy -> broken clouds