Merge pull request #2734 from nealef/master