Merge pull request #3744 from naglis/cloudy