One more broken link.
Merge branch 'stable'