Merge branch 'develop'
libslax-0.17.2
Merge branch 'master' into develop