Merge pull request #2566 from louis89/master