issue #938
Merge branch 'hotfixes' of github.com:osclass/Osclass into hotfixes