Merge pull request #1695 from gregoryyoung/master