[MIN] Fixes #952
Merge branch 'stable'