Merge pull request #6306 from dhewg/buildflags