[FIX] Fixes #945
Merge branch 'stable'