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