Merge pull request #1976 from curious-rabbit/master