Merge pull request #2995 from corenetworks/master