Merge pull request #2505 from aparcar/master