Merge changes from devel for release 0.4.1