Fix #860
Merge branch 'master' of github.com:lesh-dev/core