Merge pull request #3094 from mbrophy1/master