Merge pull request #2042 from dstftw/master