#! bugfix
#! changelog, version
Merge branch 'master' into devel