v0.095
Merge branch 'master' into devel