Merge pull request #2857 from malaterre/master