Merge pull request #2006 from dstftw/master