Merge pull request #3037 from mbechard/master