Bug 960491 - Add flatfish support
Merge pull request #153 from dannyliang/master

Bug 960491 - Add flatfish support