fixed version
Merge branch 'stable'