Merge pull request #1921 from mattzink/master