Merge pull request #2482 from outini/master