Merge pull request #768 from Dbroqua/master