Merge pull request #926 from ermshiperete/novell-bug-674098