Merge pull request #943 from ermshiperete/bug-novell-325669