Merge pull request #757 from mlintner/master