Merge with bugfix-0.5
debian/docs
1