Merge pull request #2622 from mmisirlis/master