Merge pull request #2587 from mbechard/master