Merge pull request #2461 from niebles/master