Use tos_url site setting in flag modal if it's set
Merge remote-tracking branch 'upstream/master'