Merge pull request #2494 from nealef/master