Allow more creative builder message suppression
Merge pull request #383 from iguanaman/1.6.4

Allow more creative builder message suppression