Fix broken test.
Merge branch 'stable'