Merge pull request #925 from ermshiperete/novell-bug-602934