Merge pull request #2630 from aparcar/thanks-all