Merge pull request #944 from ermshiperete/bug-novell-496138