Using 1.1-RC1
Merge branch 'master' into cluster