Merge branch 'stable/folsom'