Merge pull request #886 from dmpot/master