Prepare for Cloud 3
Merge pull request #1935 from dirkmueller/master

+1