Merge pull request #1317 from nealef/master