Merge pull request #2011 from dstftw/master