Merge pull request #752 from dodo/master