cleanup
Merge branch 'stable'