Merge pull request #751 from erlandsona/master