FFS upstream

Eisenhauer, Gregrequested to merge
FFSupstream into master

Patches in ffs_conv.c repair a performance bug in FFS with conversion generation turned off.

Merge request reports