Merge pull request #2026 from alanswanson/master