Merge branch 'stable'
Merge branch 'rel-0.9.2' into stable