Merge pull request #1292 from ogres/master