Merge changes from iainrb/devel for release 0.4.1