Merge pull request #922 from ermshiperete/novell-bug-599689