Merge pull request #372 from bradbishop/garrison

Fix Garrison/Firestone build breaks