Add -f alternative for --forks default argument
Merge remote-tracking branch 'github/master'