Import HugoLuman's bugfix release from http://dffd.wimbli.com/file.php?id=7984