Merge pull request #3310 from robinsonb5-PRs/master