Merge pull request #2279 from prutz1311/master