Set maximum number of allowed flags.
Merge remote-tracking branch 'origin/master'