Sanitize flags.
Merge remote-tracking branch 'twitter/master'

* twitter/master:
  Sanitize flags.