Merge pull request #690 from stweil/master