Merge pull request #806 from dhewg/buildflags