Wow, rubygems repository is down, syncing with our own sources
Merge branch 'master' into play_2_2