Tone down the nohup pitch in FAQ, it rarely works nowadays
Merge branch '1.6'