Merge pull request #2223 from lobrien/master