Merge pull request #2361 from stokito/master