Merge pull request #2713 from gregoryyoung/master