Merge pull request #1280 from nealef/master