Merge pull request #1599 from ancwrd1/master