Nfq reloaded v1.2

Here's a new PR for Florian Westphal's NFQ work. He has fixed the indent issue previously seen. I've also merged his two last patches as they form a consistent modification when merged.