Merge pull request #2139 from dstftw/master