Merge pull request #1026 from panpawn/patch-19