[ffigen] Merge pull request #269 from mannprerak2/merge_stable

Merge stable to master.