Merge pull request #1978 from philenotfound/master