Merge pull request #4249 from nickberry17/master