Merge pull request #669 from ohardy/master