Fix typo
Merge branch 'stable'