Merge pull request #1956 from dstftw/master