Merge pull request #2311 from mlancione/master