some workaround for PHP warnings
Merge branch 'stable'