Merge branch 'develop'
libxo-0.1.5
Merge branch 'master' into develop