8da7bed Merge pull request #1198 from dbbert/patch-1