Merge pull request #2553 from anisse/master