v3.1.8: fix -F

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Merge branch 'release/3.1.8' into develop