Merge pull request #1515 from pdelbar/fixgencode