Merge pull request #2272 from dstftw/master