Merge commit 'stable/20110609'