issue #817
Merge branch '817' into develop
Merge branch 'develop' of github.com:osclass/Osclass into develop