Merge pull request #2936 from padre-lacroix/master