Merge pull request #863 from davidcl/master