Auto-Merge pull request #2053 from nuclearcat/master