Make badge increment optional (defaults to true)
Merge branch 'refs/heads/OptionalBadgeIncrement'