Merge pull request #2195 from dstftw/master