[svn-upgrade] Integrating new upstream version, iodine (0.4.1)