Merge pull request #2985 from tylerharper/master